android stuff
more android stuff
Merge branch 'master' of https://github.com/adrianvit/dcda
stuff
Merge branch 'master' of https://github.com/adrianvit/dcda

Conflicts:
	local/src/main/java/com/team314/dcda/local/resources/NotificationResource.java
Merge branch 'master' of https://github.com/adrianvit/dcda
stuff