int to float
increased planning time
real object height
fixed quaternion conversion
simple live demo
Merge branch 'master' of https://github.com/ipa320/automatica2014

Conflicts:
	automatica2014_scenario/src/automatica2014_scenario/pick_place.py (solved)
Merge branch 'master' of https://github.com/ipa320/automatica2014
Merge branch 'master' of https://github.com/ipa320/automatica2014