Merge remote-tracking branch 'origin/master' into Huys_Branch
Merge remote-tracking branch 'origin/master' into Huys_Branch
Merge branch 'master' into Huys_Branch
new friendOf table and login scripts
Update ContactActivity.java
Update CreateAccountActivity.java
Update LoginActivity.java
Update MainActivity.java
Update ManageGroupActivity.java

Not yet fully completed for SCRUM Sprint 3
Create MustLogoutReceiver.java
Create NoBackingReceiver.java
Update NotificationActivity.java
Update ResolveTransactionActivity.java
Create PageKillReceiver.java
Update SettingsActivity.java
Update ShortcutsActivity.java
Update StatisticActivity.java
Update Transaction1Activity.java
Update Transaction2Activity.java
Update Transaction3Activity.java