Syncing

Conflicts:
	SKYAS/test/uk/co/skyas/dao/CustomerDAOTest.java