Merge branch 'dev' into mobile
Merge branch 'mobile' of https://github.com/fourbroad/agilenotes into mobile
Merge branch 'mobile' of https://github.com/fourbroad/agilenotes into mobile