Added mocap_pose_estimate plugin.
Removed un-needed times.
Minor changes.
Fixed styles.
Fixed dual sources error warning.
Updated mavros_plugins.xml
Merge pull request #116 from tonybaltovski/mocap

Added mocap_pose_estimate plugin.
launch: APM2 blacklist mocap plugin.
global_position plugin - initial commit
Merge branch 'master' of https://github.com/vooon/mavros into global_position
added rel_pos and compass_hdg pub; minor corrections
Merge pull request #118 from TSC21/global_position

Global position plugin
plugin: global_position: Move heaedr; Style fix.
plugin: global_position: Unit unification.
launch: APM2 blacklist global_position plugin
plugin - global_position - changed parameter path / orientation source
plugins: global_position: use relative_alt on position.z;
mavros_plugins.xml - corrected declaration of mocap_pose_estimate
plugins: global_position: get pose orientation from the one stored in uas
plugin: mocap: Fix load.

Issue #121.
Merge branch 'global_position' of github.com:TSC21/mavros into TSC21-global_position

* 'global_position' of github.com:TSC21/mavros:
  plugins: global_position: get pose orientation from the one stored in uas
  plugins: global_position: use relative_alt on position.z; mavros_plugins.xml - corrected declaration of mocap_pose_estimate
  plugin - global_position - changed parameter path / orientation source

Conflicts:
	mavros/mavros_plugins.xml