working on display project panel
Merge branch 'master' of https://github.com/akashmalla/FrugalInnovationLabProject

Conflicts:
	src/META-INF/persistence.xml