Updated user profile
Merge branch 'master' of https://github.com/madthad91/tSolutions
Merge branch 'master' of https://github.com/madthad91/tSolutions
Added post/answers comments
Merge branch 'master' of https://github.com/madthad91/tSolutions

Conflicts:
	www/js/controllers.js
	www/templates/post.html