Making UI changes
UserController
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/WeddingPics/gen/com/weddingpics/R.java
	android/WeddingPics/src/com/weddingpics/AlbumActivity.java
	android/WeddingPics/src/com/weddingpics/CameraActivity.java
	server/WeddingPics/src/main/java/com/weddingpics/rest/controller/UserController.java