Data loader - completed
Merge branch 'master' into dev/model/feature-oriented

Conflicts:
	app/controllers/Application.scala
	app/controllers/Rest.scala
	app/dao/DAO.scala
	app/dao/Features.scala
	app/models/Feature.scala
	build.sbt
	conf/application.conf
	conf/routes

Minor tweaks, some documentation
Minor tweaks, some documentation