merging
Merge branch 'master' of github.com:Postiles/frontend
data manager bug fixed