Update .gitignore
Update .gitignore
Update .gitignore
Merge branch 'devel'

initial code seeding
Merge branch 'master' of https://github.com/icclab/cyclops-web
Merge branch 'devel'

added ability to generate pdf bills
Merge branch 'devel'

Merged with latest commit from Tea
several bug fixes, some hardcoded parameters still exists