Merge branch 'master' into bookshelf
Replacing node_template instance variables
Merge branch 'master' into bookshelf
Merge branch 'bookshelf' into bookshelf-express