f
Merge branch 'dev' of https://github.com/ashamsutdinov/elegance into dev

Conflicts:
	.gitignore
	Framework/Db/Elegance.Main/Elegance.Main.sqlproj