Twitter Bootstrap template and angular routing
Merge remote-tracking branch 'origin/master'

Conflicts:
	Web_CA/Presentation/src/main/java/za/co/tera/presentation/controller/IndexController.java
	Web_CA/Presentation/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	Web_CA/Presentation/src/main/webapp/WEB-INF/pages/hello.jsp
	Web_CA/Presentation/src/main/webapp/resources/css/lib/bootstrap-responsive.css
	Web_CA/Presentation/src/main/webapp/resources/css/lib/bootstrap-responsive.min.css
	Web_CA/Presentation/src/main/webapp/resources/css/lib/bootstrap.css
	Web_CA/Presentation/src/main/webapp/resources/css/lib/starter-template.css
	Web_CA/Presentation/src/main/webapp/resources/js/lib/bootstrap.js
	Web_CA/Presentation/src/main/webapp/resources/js/lib/bootstrap.min.js
	Web_CA/Presentation/src/main/webapp/resources/js/lib/jquery-1.11.1.min.js