Merge pull request #29 from Venture-TheSphinxTeam/dev

Dev
Merge pull request #30 from Venture-TheSphinxTeam/dev

Dev
Revert "making this project work nicely with eclipse"

This reverts commit a823a21ee26478c4ea26ad8afcfc77fc8fb0a31c.

Conflicts:
	conf/application.conf.test
Adding bootstrap.css
Merge pull request #2 from ShadowSam/master

Small update to readme and test push from Sam's fork.
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx.git into dev
Adding bootstrap to website
Adding in bootstrap-tab.js and adding the tabs for the dashboard feeds.
Added angular.js to app and tested it out.
Getting rid of this default test until it's actually needed
I don't like view tests.  Also, these default tests need to not be running.
Delete .classpath
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx.git into dev
Adding more to dashboard
Formated HTML and added another thumbnail
Updated for mongo plugins
Removed target directory and killed the main.css stylesheet
Worked on master page.  Put a default, cruddy sidebar up for Sam to tweak into niceness
getting up to date with dev branch
Prettier sidebar and attempt at urls for the pages... Note the URLs do not work.