new code update

new release code
Merge branch 'master' of https://github.com/richeaston/Monitus

Conflicts:
	css/sb-admin.css
	css/style.css