added pagnation testing on ale
Merge branch 'master' of github.com:EpiXl33t/LocationMapperV3

Conflicts:
	src/LocationMapper/SQLConnection.java

asdf