ok
Merge branch 'master' of https://github.com/flaviusanderson/smartbox

Conflicts:
	SmartBoxWeb/SmartBoxWeb/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Mario1 20:45 - 29.08.2014