initial commit
Merge remote-tracking branch 'origin/grunt' into grunt

Conflicts:
	.bowerrc
	app/images/bg.jpg
	app/images/overlay.png
	app/scripts/app.js
	app/scripts/controllers/album.js
	app/scripts/controllers/song.js
	app/scripts/services/album.js
	app/scripts/services/artist.js
	app/scripts/services/song.js
	app/styles/main.css
	app/views/albums.html
	app/views/songs.html
	bower.json
	music-library-client/app/images/bg.jpg
	music-library-client/app/images/overlay.png
	music-library-client/app/scripts/app.js
	music-library-client/app/scripts/controllers/album.js
	music-library-client/app/scripts/controllers/song.js
	music-library-client/app/scripts/services/album.js
	music-library-client/app/scripts/services/artist.js
	music-library-client/app/scripts/services/song.js
	music-library-client/app/styles/main.css
	music-library-client/app/views/albums.html
	music-library-client/app/views/songs.html
	package.json
	src/main/webapp/resources/albums.html
	src/main/webapp/resources/css/img/bg.jpg
	src/main/webapp/resources/css/img/overlay.png
	src/main/webapp/resources/css/style-common.css
	src/main/webapp/resources/js/app.js
	src/main/webapp/resources/js/controllers/album.js
	src/main/webapp/resources/js/controllers/song.js
	src/main/webapp/resources/js/services/album.js
	src/main/webapp/resources/js/services/artist.js
	src/main/webapp/resources/js/services/song.js
	src/main/webapp/resources/songs.html