...
Merge branch 'master' of https://github.com/BismarckSC/life

Conflicts:
	app/criar_album.php