color icons
Merge remote-tracking branch 'origin/production' into production

Conflicts:
	app/assets/images/facebook-icon.png
	app/assets/images/google-icon.png
	app/assets/images/twitter-icon.png
	app/assets/images/vkontakte-icon.png