Commit;
Merge branch 'master' of github.com:crasyhorse/Test2

Conflicts:
	template/cache/spiceworks_prod.db