add stuff
Merge branch 'dev' of https://github.com/Blazur/blazur into dev

Conflicts:
	dist/styles/app.css
Merge pull request #24 from Mayho/dev

Merge Mehul's dev branch
add job api
Merge branch 'dev' of https://github.com/Blazur/blazur into dev
feat(settings api): scaffold