Merge pull request #1 from olga-jane/master

Update from 7/11/14
Railcar use-case
Merge pull request #160 from demmy/master

example from Alexander
fix conflicts
forms structural
clean rebuild
db connect
localDB
folder organization changes
Merge pull request #162 from olga-jane/After_Alex

Merging with example from odem