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
Fix alias use in filter forms.
Bug fix.
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
Merge branch 'master' of git://github.com/nursix/eden
Cleanup.
DRMP: Fix Addresource Popups for Bootstrap formstyle, Profile pages for Stakeholders & Locations, basic Section pages for the 3 Profiles.
* Req Fix
Merge branch 'master' of git://github.com/michaelhowden/eden
New field path parser incl. context resolver, fixes for unresolvable
context paths (prepare for global context filter).
Bug fix.
GIS Polygons can be styled - e.g. Fire perimeters, add Heliports to Transport module, allow some Map Controls to be disabled (e.g. for smaller portlets)
Merge branch 'master' of git://github.com/nursix/eden
Global hook for context filters (currently deactivated as not passing all unit tests yet)
All unit tests passed, hook activated.
Workaround for a memory leak in current.response.s3