merge feature/backend
quick fix on frontend view
Merge pull request #3 from soyel/develop

Develop