Add package.json and remove component.json
Update .gitignore
Fix make
Merge branch 'development'