added disallow links to robots.txt
Fixing the getRooms query.
Add client.html to gulp
Merge pull request #285 from scrollback/seo

added disallow links to robots.txt
Merge pull request #288 from scrollback/gulp

Add client.html to gulp
Changed headings to h2 and added string
Merge branch 'master' into gulp
Indentation
Merge pull request #287 from scrollback/query-fix

Fixing the getRooms query.
Remove redundant get started screen
Merge branch 'master' into gulp
Fix typo
Merge pull request #289 from scrollback/gulp

Changes for phonegap
Changing the priority value for loading default states.
Merge pull request #290 from scrollback/state-fix

Changing the priority value for loading default states.
Merge branch 'master' into callstoaction

Conflicts:
	gulpfile.js