conflict resolved...
Merge branch 'master' of http://runwalsoft/arca/repositories/arca
file commited..

Signed-off-by: Manish Patil <manish.patil@runwalsoft.com>
Merge branch 'master' of http://runwalsoft/arca/repositories/arca

Conflicts:
	public/app/app.js
app.js and home.ejs files commited..

Signed-off-by: Manish Patil <manish.patil@runwalsoft.com>
removed angular-deckgrid
Merge branch 'master' of http://runwalsoft/arca/repositories/arca
removed unwanted js and css

Signed-off-by: somnath <somnath@runwalsoft.com>