Merge pull request #5 from fatrix/develop

Develop
Merge branch 'develop'
update version
Merge branch 'master' of https://github.com/fatrix/django-fastapp
add ng-grid, settings to func
cleanup settings
fix angular issue
Merge branch 'feature/settings_per_base' into develop