delete rb-inotify
Merge branch 'master' of https://github.com/walkerart/screens_admin

Conflicts:
	Gemfile
added to bower for css of typeahead