sorted t tasks
Merge remote-tracking branch 'origin/timor/gapp' into timor/gapp
sync commit
added Child and Task models
working qr codes
working qr codes
made Child, Task and Parent to entities
fixed bug
Merge remote-tracking branch 'origin/classImplementation' into timor/gapp

Conflicts:
	app/app-war/src/main/webapp/html/parent/index.html
	app/pom.xml
pom.xml cleanup
populate tsk
Merge branch 'ppPreapproval' into timor/gapp

Conflicts:
	app/app-war/src/main/java/com/b14h/controllers/PreapprovalServlet.java
	app/pom.xml