updated the main nav bar to include all menu items and a settings cog also placed the alerts space withn a span6 to kept it centered
improved the spacing and layout of the add new modal -- some minor design changes as well
Improved the look and layout of cards on the river -- personal details on profile card still an issue - it will need to be addressed via the template
some more minor changes to the card to help with layout etc
Merge branch 'master' of git://github.com/catalpainternational/eden

Conflicts:
	private/templates/DRMP/views/index.html
	private/templates/DRMP/views/layout.html
	static/themes/DRMP/menu.css
	static/themes/DRMP/style.css
Missing file