Work on demo & test prepop data
Bug fix.
Merge branch 'master' of git://github.com/flavour/eden
Fix Project Search
Merge branch 'master' of git://github.com/nursix/eden

Conflicts:
	VERSION
DRMP icon tweaks, update font-awesome
Merge branch 'master' of git://github.com/flavour/eden
Profile Maps can go full-screen
Merge branch 'master' of git://github.com/flavour/eden
default/user uses bootstrap submit-style when-needed without destroying
injected buttons. Deprecate DRMP custom login screen.
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/graeme-f/eden
Sync log: better reporting of <resource>-level errors
Merge branch 'master' of git://github.com/flavour/eden
Revert Map Clusters to Circle rather than Icon
Make the cluster attribute configurable
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/flavour/eden
Bugfix
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/eden
Importer: don't try to validate deleted records, just find them.