Merge branch 'dev' into dev-1.3.0
+ #577 ContentOptionTypes table renamed to OptionTypes

Conflicts:
	BetterCms.sln
	packages/repositories.config
Merge branch 'dev-1.3.0' of github.com:devbridge/BetterCMS into dev-1.3.0