Backend Edit Theme
Merge branch 'master' of https://github.com/noxfate/dogether

Conflicts:
	app/views/owner/master.blade.php