Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master' of github.com:andef4/ch.bfh.bti7081.s2013.blue
updated database script and admin application
enhanced main menu
enhanced swissmedic import