Working progress : angularjs post v2.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Web_CA/Presentation/src/main/java/za/co/tera/presentation/controller/IndexController.java
Working progress : angularjs post v2.1