rejected_with_commits fix
added rebuild to current branch
Merge branch 'feature/rebuilder' into develop
bump version 1.2.5
Merge branch 'master' into release/1.2.5

Conflicts:
	lib/trinity/cli.rb
fixes
Merge branch 'release/1.2.5'