Resolving merge conflicts.
Ability to add albums
Merge branch 'add-album'

* add-album:
  Ability to add albums
  Resolving merge conflicts.

Conflicts:
	app/pages/home/home.html
	app/pages/login/login.html
	app/pages/login/login.js
	app/router.js
	lib/Aa.app.js