Merge branch 'master' of https://github.com/7h3v01d/photal

Conflicts:
	PhotoAlbum/src/com/photal/photoalbum/data/User.java