gemfile update
added user_observer to modify mailflow
modified some items
some admin changes
unique email
faculty creation
mail changes
Added emailflow
added basic cache setup
Added brakeman into Gemfile and Guardfile
changed application.erb to haml
restored and added _hively.html.haml
updated reference
adthenticate mailview
Guardfile comment broken jasmine
better fix for erb 2 haml
Merge branch 'develop' into feature/uml

Conflicts:
	Gemfile.lock
fixed conflict
Added railroady to generate uml for documentation
refactored user