Empty angular project
Merge branch 'master' of github.com:tnunamak/bvio-2014
Adding backend
Fixing conflicts