Merge branch 'Android' of https://github.com/Mr-Black/engagement-tracker into server
Added some documentation to server code
Merge branch 'server' into Develop