adding first cut for import content elements from a flat file
Merge branch 'master' into import-content-elements

Conflicts:
	app/controllers/Services.scala
	app/views/index.scala.html
Merge branch 'master' into import-content-elements

Conflicts:
	app/models/Cluster.scala
added changes for import Content-Elements from flat file
Merge branch 'master' into import-content-elements

Conflicts:
	app/views/index.scala.html
adding code to clear client side cache and also clear position info over server after import
Obvious consolidations
Angular leftover
Start the grid centered
Cleanup logging
Merge branch 'master' into import-content-elements

Conflicts:
	app/assets/javascripts/renderCluster.coffee
	app/views/index.scala.html
Refresh autosuggest items after import
Merge branch 'import-content-elements'
Merge branch 'master' into delete-grid-elements

Conflicts:
	app/assets/javascripts/hexgrid.coffee
	app/views/index.scala.html