cleanup
Merge branch 'Tim' of https://github.com/cstupi/ERApp into Tim