Merge
Merge branch 'sprk' of github.com:CreativeMobile/socmap-mp into sprk

Conflicts:
	app/assets/javascripts/admin/templates/content/list.jst.eco
	app/assets/javascripts/admin/views/content/list.js.coffee