Sams fix
Merge branch 'master' of github.com:sawise/Pub

Conflicts:
	MyApplicationProject/bottomApp/src/main/java/com/group2/bottomapp/Connection.java
Merge branch 'master' of github.com:sawise/Pub