Update README.md
Annotate source directories with README.md’s for reviewers.
Minify the JS in the dist folder.
Lots of changes.
Add .jshintrc for IDE inspections
Updated README with revised requirements and requirements descriptions
Updated README todo list
Updated grunt.automation.js, moved automation sub-modules into js/automation
Refactored lights/temperature into room/zone endpoints
Moved all Automation UI into automation.html to keep it clearly separated from the future jQuery UI, included temperature-form.html
Documented API events more thoroughly
Floorplan is now a directive instead of a simple controller (more ideal for manipulating elements) and moved to automation.js
Moved services into their own file
Updated Readme todos
Created jQuery API adapter.
Update todo’s
Update README’s
Moved controllers and directives out of automation.js into the automation subfolder.
Updated README
Complete implementation of jQuery API Consumer UI
Updated Readme
Added logging endpoint to demonstrate jQuery AJAX request
Fixing unicode issue…. again :)
Added jQuery to karma conf
Add unit tests (incomplete)
Add unit tests (incomplete)
Completed automation api controller unit tests
Removed $timeout delays (too hard to test reliably, and honestly unnecessary)
Add unit tests for the event adapter
Fix bug where AutomationCtrl loads data too quickly and the Zones / Rooms don’t update
Updated README.md and added API.md
Improve error handling for undefined room/zone objects
Update unit tests for PhantomJS and create travis build config
Push a travis change to trigger a build
Add build status
Clean up documentation
Fix APIConsumer.js capitalization
Merge branch 'master' into gh-pages

* master:
  Fix APIConsumer.js capitalization
  Clean up documentation
  Add build status
  Push a travis change to trigger a build
  Update unit tests for PhantomJS and create travis build config
  Improve error handling for undefined room/zone objects
  Updated README.md and added API.md
  Fix bug where AutomationCtrl loads data too quickly and the Zones / Rooms don’t update
  Add unit tests for the event adapter
  Completed automation api controller unit tests Removed $timeout delays (too hard to test reliably, and honestly unnecessary)
  Add unit tests (incomplete)
  Add unit tests (incomplete)
  Complete implementation of jQuery API Consumer UI Updated Readme Added logging endpoint to demonstrate jQuery AJAX request Fixing unicode issue…. again :) Added jQuery to karma conf
  Updated README
  Created jQuery API adapter. Update todo’s Update README’s Moved controllers and directives out of automation.js into the automation subfolder.
  Updated Readme todos
  Lots of changes. Add .jshintrc for IDE inspections Updated README with revised requirements and requirements descriptions Updated README todo list Updated grunt.automation.js, moved automation sub-modules into js/automation Refactored lights/temperature into room/zone endpoints Moved all Automation UI into automation.html to keep it clearly separated from the future jQuery UI, included temperature-form.html Documented API events more thoroughly Floorplan is now a directive instead of a simple controller (more ideal for manipulating elements) and moved to automation.js Moved services into their own file
  Annotate source directories with README.md’s for reviewers. Minify the JS in the dist folder.
  Update README.md

Conflicts:
	README.md
	bin/room.json
	bin/temperature.json
	bower.json
	dist/automation.js
	grunt.automation.js
	grunt.index.js
	js/automation.config.gh-pages.js
	js/automation.config.js
	js/index.js
	partials/temperature-form.html
	src/main/stubs/house/room.json
	src/main/stubs/house/zone.json
	src/main/stubs/room.json
	src/main/stubs/zone.json
	src/main/www/js/automation.config.gh-pages.js
	src/main/www/js/automation.config.js
	src/main/www/js/automation/config.gh-pages.js
	src/main/www/js/automation/config.js
	src/test/www/js/index.js
	src/test/www/js/karma.index.js