Feature class overhaul to fix mapped-instagram 'mapper' and 'user'. Needs to refresh database on deploy.
Merge branch 'master' of https://github.com/engagelab/Mappa

Conflicts:
	app/controllers/Features.java
	app/models/Feature.java