Removed conflict messages
Committing removal of confilcts in xml...
Resolved merge conflicts
Merge branch 'master' of https://github.com/justin-calleja/mongo-connector.git
Removing unnecessary imports