commit
Merge branch 'master' of https://github.com/twocngdagz/ReputationKahuna.git

Conflicts:
	index.html
	js/app.js
	js/views/home.js
	tpl/CompanyListView.html