Grid with controller options sample
Index page link to grid contoller sample
Merge branch 'master' of https://github.com/damyanpetev/igniteui-angular into damyanpetev-master

Conflicts:
	index.html
	samples/js/igniteui-sample.js
Merge branch 'damyanpetev-master'