Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/controllers/album-controller.js
	scripts/main.js
	scripts/view.js