Uploading Base Theme Files
TODO Clean up code and remove other branding
Merge origin/master

Conflicts:
	style/css/dev-style.css