add
merge

Merge branch 'master' of https://github.com/xkeecs/photoLocator

Conflicts:
	src/com/photolocator/activity/LoginActivity.java
Merge branch 'master' of https://github.com/xkeecs/photoLocator
Cassandra
merge

Merge branch 'master' of https://github.com/xkeecs/photoLocator

Conflicts:
	src/com/photolocator/tab/NearByActivity.java