- fix image loop bug
Merge branch 'develop'

Conflicts:
	server.js