Merge branch 'master' into development
reorganized folders, added API and Landing Page
Merge branch 'development'