Merge with angularJs demo project