add strings
change uiondone interface
change user id
add profile layout
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	project/res/layout/fragment_hot_spot_details.xml
	project/src/il/ac/technion/socialcampus/MainActivity.java