server
Merge branch 'r1' of github.com:TaylorDocdoku/tagroidz into r1

Conflicts:
	tagroidz-controllers/tagroidz-cordova/www/app.js