Merge branch 'master' into development
[UPDATE] minor changes and bugfixes

- switched to grunt 0.4
- changed grunt tasks to 0.4 compatible versions
- minor changes/bugfix to base.js
Merge branch 'development'