working from aria - stupid routing. AGAIN
Merge branch 'master' into gh-pages

Conflicts:
	bot4square/js/app.js