Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/scripts/controllers/main.js
	app/scripts/services/monocle.coffee
	app/views/main.html