Merge pull request #1 from tantrum-junkie/master

Various fixes, cleanups, some refactoring ;)
variant, holiday switching
Merge remote-tracking branch 'upstream/master'
grrr
Working on SmartPlanner
* added x-editable plugin
* did some css modifications
* added smartPlan controller
* day descriptions now x-editable