Added needed files.
New Gruntfile
Merge branch 'master' of https://github.com/komola/salad-example

Conflicts:
	dev.sh