Merge branch 'master' of git://github.com/tsagi/p-space-android-app into master

Conflicts:
	.idea/.name
	.idea/compiler.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/workspace.xml