added force flag
added offset for place
Merge branch 'master' of github.com:ipa320/automatica2014

Conflicts:
	automatica2014_scenario/src/automatica2014_scenario/pick_place.py