Markup init
Merge branch 'master' of https://github.com/CreativeMobile/socmap-dfl

Conflicts:
	app/.DS_Store
	app/assets/.DS_Store
	app/controllers/widget_controller.rb
	config/routes.rb