update inch
Merge branch 'master' of https://github.com/socializer/socializer

Conflicts:
	socializer.gemspec
update inch