change
Merge branch 'dev' of github.com:Ajhandler/Local into dev

Conflicts:
	app/controllers/templates_controller.rb
add theme tables change theme relationships
Merge pull request #35 from Ajhandler/themeing

Themeing