Merge pull request #33 from Ajhandler/config

Config
Merge pull request #34 from Ajhandler/config

Change template to theme
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
add theme  id to company when created
Merge pull request #36 from Ajhandler/themeing

add theme  id to company when created
Add paperclip, Add delete button to delete user site
?