begin main controller rewrite
resolve conflicts
simplify main controller, remove old files and fix reset button
Merge remote-tracking branch 'origin/fix_#34' into new_glyphs

Conflicts:
	app/scripts/app.js