changes made to typo files
changes in app/views/admin/shared/-edit.html
Merge branch 'mainank'
Merge branch 'master' of https://github.com/cbayne/typo

Conflicts:
	app/views/admin/shared/_edit.html.erb
	db/db_development
	db/db_test