update;
Merge branch 'development' of github.com:joeonmars/hlc-portfolio into development

Conflicts:
	craft/app/Info.php
	craft/app/templates/entries/_edit.html
fixed sidebar and its arrow remain visible in masthead bug;