re-built frontend: using yo, grunt, bower, angular
merge fixed
Readme