Minor changes in order to get this mess straight

Merge branch 'master' of https://github.com/khreez/Test2

Conflicts:
	src/main/resources/ehcache.xml
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#   (use "git push" to publish your local commits)
#
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   pom.xml
#	modified:   src/main/java/com/nearsoft/dao/impl/AirportDAOImpl.java
#	modified:   src/main/java/com/nearsoft/persistence/BaseHibernateDAO.java
#	modified:   src/main/resources/ehcache.xml
#	modified:   src/main/resources/hibernate.cfg.xml
#	modified:   src/main/resources/log4j.properties
#
javax servlet api dependency added in order to run integration test for SiteController. It is only needed for this matter. That is why the scope is "provided".
gigantic error that i was able to find once i run the integration testing of SiteController. I was trying to cast a String into a Date.
no real changes, just moving some code to other places
moved from other location in order to help doing the tests
removed some unnecessary imports
new test
ultimate test for this controller. It includes the test for web paths fro three methods/paths :  "/" -> welcome(); "/airports" -> getAirports(); "/search" -> getFlights(). It all works like heaven
ultimate test for this controller. It includes the test for web paths fro three methods/paths :  "/" -> welcome(); "/airports" -> getAirports(); "/search" -> getFlights(). It all works like heaven