Daily Commit
Blueprint Arrows & drag n drop
Blueprint Arrows & drag n drop
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 3 commits.
#   (use "git push" to publish your local commits)
#
Merge branch 'master' of https://github.com/guy-mograbi-at-gigaspaces/gs-ui-ks

Conflicts:
	app/index.html
	app/views/main.html
	bower.json