keep AuthenticationServer/src/main/resources/ folder not empty
remove the content under target directory
add .gitignore entry for SharedResource
gitignore
let git not to track SharedResource build file
add .gitignore for AuthenticationClient
remove built out file in SharedResource
remove built out file in SharedResource
query change for database schema change
Merging master again
Merge branch 'master' into develop

Conflicts:

AuthenticationServer/target/classes/edu/cmu/ini/impli_auth/server/Centra
lServer.class

AuthenticationServer/target/classes/edu/cmu/ini/impli_auth/server/sqlCon
nection.class

AuthenticationServer/target/m2e-wtp/web-resources/META-INF/maven/com.imp
l_auth.common/CentralServer/pom.properties
Merge branch 'develop' of https://github.com/cmusv-sc/Practicum2014-Ericsson-Authentication into develop

Conflicts:

AuthenticationServer/target/classes/edu/cmu/ini/impli_auth/server/Centra
lServer.class

AuthenticationServer/target/classes/edu/cmu/ini/impli_auth/server/sqlCon
nection.class

AuthenticationServer/target/m2e-wtp/web-resources/META-INF/maven/com.imp
l_auth.common/CentralServer/pom.properties
Some old stuff about database
Added Step detector

Not yet sending it but printing it out in the console.
Merge branch 'step_counter' into develop
Implemented Geo-fencing.

Implemented Geo-fencing. Working with database on VM. Includes some
test code for reading database.
Implemented Changes in Database.

Implemented the changes in the server. Also removed hard coding of
USER-ID from the APP. Now USER_ID is obtained using a query on Device.
add opencv facial recognition android code
Login process on share resource and server; show all device of a user; delete a specific device
open cv ported to server test