Merge pull request #1 from xmppjingle/master

Merge base repo
Delete file
Reformat code
Merge pull request #2 from yuilop/master

Merge from last changes
Update to ecomponent 1.0.0
Merge branch 'feature/update_ecomponent' into develop
Merge branch 'master' into develop

Conflicts:
	apps/jn_component/src/jingle_handler.erl
	apps/jn_component/src/jingle_relay.erl
	apps/jn_component/src/jn_component_app.erl
	apps/jn_component/src/jn_schedule.erl
	apps/jn_component/src/notify_handler.erl
	apps/jn_component/test/jn_schedule_test.erl
	rebar.config
	rel/files/app.config
Fix merge
Reformat code
Finish the call when no data in one of both sides
Merge pull request #1 from artefactop/develop

Develop