More fixes.
Attempting to resolve merge conflicts.

Merge branch 'master' of https://github.com/TheRightDirection/Aro

Conflicts:
	aro_quiver/compiler/public/pages/index.html