mysql password

mysql password
Merge branch 'master' of https://github.com/akashmalla/FrugalInnovationLabProject

Conflicts:
	build/classes/META-INF/persistence.xml
	src/META-INF/persistence.xml