Application Login functionality
Merge branch 'master' of https://github.com/vharnath/Pristine

Conflicts:
	src/test/java/com/pristine/parse/WineDaoTest.java