q
Merge branch 'master' of https://github.com/freshbit/CodeBlue

Conflicts:
	CodeBlue/bin/CodeBlue.apk
	CodeBlue/bin/classes.dex
	Server/CodeBlueServer/orders/views.py