Merge branch 'master' of https://github.com/alisteroz/treebook

Conflicts:
	.gitignore
	.idea/rails-simpleapp.iml
	.idea/vcs.xml
	.idea/workspace.xml
	Gemfile
	Gemfile.lock
	app/models/status.rb