for merge
Merge branch 'master' of https://github.com/agentmetrics/AM
Merge branch 'master' of https://github.com/agentmetrics/AM
Merge branch 'master' of https://github.com/agentmetrics/AM

Conflicts:
	app/assets/stylesheets/main.scss
Merge branch 'master' of https://github.com/agentmetrics/AM