Adding sample date at boostrap
Merge branch 'master' of https://github.com/enriquebits/pegasus

Conflicts:
	migration/env.pyc
	pegasus/__init__.pyc
	pegasus/config/__init__.pyc
	pegasus/config/app_cfg.pyc
	pegasus/config/environment.pyc
	pegasus/config/middleware.pyc
	pegasus/controllers/__init__.pyc
	pegasus/controllers/dashboard_controller.pyc
	pegasus/controllers/error.pyc
	pegasus/controllers/root.pyc
	pegasus/controllers/sample_controller.pyc
	pegasus/lib/__init__.pyc
	pegasus/lib/app_globals.pyc
	pegasus/lib/base.pyc
	pegasus/lib/helpers.pyc
	pegasus/model/__init__.pyc
	pegasus/model/auth.pyc
	pegasus/model/category.pyc
	pegasus/model/link.pyc
	pegasus/model/sample.pyc
	pegasus/model/tag.pyc
	pegasus/templates/__init__.pyc
	pegasus/websetup/__init__.pyc
	pegasus/websetup/bootstrap.pyc
	pegasus/websetup/schema.pyc