A Lot of stuff !
Merge branch 'master' of github.com:sbellity/aura-github

Conflicts:
	public/views/layout.php
	public/widgets/org/org.html