complete Assembla integration
Merge remote-tracking branch 'rt/master'

Conflicts:
	Gemfile.lock