Remove old compiled code
Remove unneeded config and template
Update gitignore
Merge branches 'master' and 'develop'