added preferences tab
Update tabs.html
Update main.css
Update services.js
Update controllers.js
Update app.js
added preferences tab
small error cleanup
getting PreferencesCntrl back
finalizing preferences
Merge pull request #49 from bace135/master

Preferences should be updated now
Conflict resolution
Merge branch 'master' of https://github.com/Tundra-Python/AppetEYES