Made a login activity before mainactivity.
Merge commit '810b0a07a7fed1eb4f46b0391e8a79f552352487' into
development/architecture

Conflicts:
	AmIciTy-incubator-Android/src/net/amicity/android/MainActivity.java
Merge commit '5e3f09ad0ce52871495aed14c678eb278c8bdfa9' into development/architecture