Merge branch 'master' into Mon1.2

Author: SterlingChin

src/components/home/home.html

@@ -8,7 +8,7 @@ <h3 id="your-next-challenge">Your Next Challenge...</h3>
         <select class="home-dropdown" ng-init="selectedProgress = progressOptions[0]" ng-model="selectedProgress" ng-options="x for x in progressOptions"></select>
       </div>
       <div class="challenge-buttons-div">
-        <a ui-sref="/#/training/{{randomKata.id}}"><button id="train-button" class="home-button">Train</button></a>
+        <a ui-sref="menu.training({kataid: randomKata.id})"><button id="train-button" class="home-button">Train</button></a>
         <button id="skip-button" class="home-button" ng-click="getRandomKata()">Skip</button>
       </div>
     </div>