Added a number of general bug fixes from master branch to base branch.
Merge branch 'base'

Conflicts:
	roncli.com/app/app.js
	roncli.com/assets/css/bootstrap-theme-override.css