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