Merge branch 'master' of ssh://bitbucket.org/PappasGroup/base-template
Merge branch 'master' of ssh://bitbucket.org/PappasGroup/base-template
changes to main.js
Merge branch 'master' of https://bitbucket.org/PappasGroup/base-template

Conflicts:
	css/print.css
	css/screen.css
	js/main.js
modified _src for _app and _libs for _plugins. Also re-arranged main.js.
updating
Merge branch 'master' of ssh://bitbucket.org/PappasGroup/base-template