Change-Id: I0fe426a9c06edbca34593aa696a999dfccb351f3
Merge remote-tracking branch 'origin/master' into new_branch

Conflicts:
	workspace_juno/VacationApp/src/com/gtech/webservices/VacationAppInterface.java
	workspace_juno/VacationApp/src/com/gtech/webservices/VacationAppResource.java
	workspace_juno/VacationApp/src/com/gtech/webservices/VacationDaoImpl.java

Change-Id: I8d7778d84784ef6eab241eac4e8f31304e74d66b
Authentication based form.


Change-Id: Ic7521b1d2c467e0ad8a0ccda9f59dc9035728522


Change-Id: Ibca7d96e7756ad16cdb6c01ed71577ae02318047
project file added to repo