merged baelter/rsimulator/master and fixed bug in Proxy
updated to version 1.0.4 after merge from baelter/rsimulator/master and a bug fix
Some refactoring and added guice injections
updated to java 1.7
updated .gitignore
improved handling of reponse content type and character encoding
Made it possible to manipulate the recorder data
Read xml with UTF-8
improved handling of reponse content type and character encoding
Made it possible to manipulate the recorder data
pom version
Some refactoring and added guice injections
improved handling of reponse content type and character encoding
WTF
Merge remote-tracking branch 'origin/master'

Conflicts:
	rsimulator-proxy/pom.xml