Merge remote branch 'remotes/deployment/master' into live

[selectricity-live] / doc / README_FOR_APP

Use this README file to introduce your application and point to useful places in the API for learning more.
Run "rake appdoc" to generate API documentation for your models and controllers.