some sutff I think
fixed merge
Changed default ip string
Merge branch 'group1_extension' of https://github.com/cs27x/mobilecloud-template into group1_extension
Merge branch 'group1_extension' into group1_extension_/feat/addvideo

Conflicts:
	Client/app/src/main/java/org/magnum/videoup/client/VideoListActivity.java