integration of mod3
Merge branch 'AngularDev' of https://github.com/gb2b/ProjectAres into AngularDev

Conflicts:
	js/controllers.js
	js/directives.js
	lib/jquery/jquery.animateNumber.min.js
	style/css/app.css
	style/sass/app.scss
s