Added unique user ID and storage in SharedPreferences
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/yhack2014/artroom/MainActivity.java
Added unique user ID and storage in SharedPreferences