Merge branch 'master' into sql
Addition motion/ file moves, missed in 203e34c83e82e5accae54ffe27f0676fa085b41d
require 'motion/project/template/ios'
Merge branch 'master' into sql

Conflicts:
	Rakefile
	lib/motion_model.rb
	motion/ext.rb
Update cocoapods