added event listner for Enter keypress on login form
Merge branch 'master' of github.com:miketurbutt/ecostudio
added nextTime to Report nav error
formatted user page text and removed hard values from form
fix conflicts
testing png
resolve conflicts