training + settings
Merge branch 'master' of https://github.com/CommercialWebDevelopment/pyramid

Conflicts:
	src/main/java/com/financial/pyramid/web/TabsController.java
	src/main/webapp/WEB-INF/pages/index.jsp
	src/main/webapp/WEB-INF/pages/tabs/home.jsp
	src/main/webapp/resources/javascript/index.js
merge