Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	.gitignore
Merge branch 'master' into develop
added the xmerl app to make dialyzer shut up
Added the deps sources to dialyze
Added a header for httpc's undefined types
Added a dependancy on inets
Added the .hrl file of the missing httpc types
Merge branch 'release/1.0'