SharedPrefsPoints
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/Nades/.idea/misc.xml
	client/Nades/.idea/workspace.xml
	client/Nades/Nades/src/main/java/com/cwat/nades/MainActivity.java