loginActivity and parse
Merge Alexis
adding entities and persistence
Merge branch 'oscar' into developer

Conflicts:
	WeMake/res/values/strings.xml
Fixing conflicts
conflicts fixed