Changed Data mapper to new idea, and I added the connection in data
mapper
Merge branch 'master' of
https://github.com/Lineaweaver/ActivityApplication.git

Conflicts:
	ActivityApp/src/dataMappers/DataMapper.java