haha oh yeah this file
bump to include CALayer frame helpers
Merge branch 'master' into feature/always-initial-reapply

Conflicts:
	Gemfile.lock
	lib/motion-kit/version.rb
	samples/ios/AutoLayout/Gemfile.lock
	samples/ios/Chatty/Gemfile.lock
	samples/ios/HelloWorld/Gemfile.lock
	samples/osx/NSPanel/Gemfile.lock
	samples/osx/TableView/Gemfile.lock
	samples/osx/TrackMix/Gemfile.lock
	samples/osx/cocoa-programming-chap-02/Gemfile.lock
	samples/osx/cocoa-programming-chap-05/Gemfile.lock