Adding of some unit tests for the Account class
Listing of the accounts on the accounts page
Update of the history JSP
Creation of the Android App
Resolution of conflicts
Merge remote-tracking branch 'origin/master' into develop
Final resolution of conflicts