rel
Merge branch 'build_type' of github.com:ethz-asl/continuous_integration into build_type

Conflicts:
	catkin_make_repo