Added makefile in preparation for merging of webapp and android app folders
Merged with android app project
Changed api address and made node app public
Merge branch 'feature/android' into develop