popup
merge popup
form
Merge branch 'dev' of github.com:nimot/Gtracker into dev