moved script.js in main.js
Merge branch 'master' of https://bitbucket.org/PappasGroup/base-template

Conflicts:
	js/main.js
moved script.js in main.js
moved script.js in main.js
removed desktop.main.js - keeping js layer agnostic of mobile vs desktop devices
added window.base.path object. moved base.js in base.path.js
Merge branch 'master' of ssh://bitbucket.org/PappasGroup/base-template