resolves #222 Butterfly TV ask that which email addresses is chosen to
associate with Butterfly TV. These mail addresses are saved to
preferences and used in other requests like GetLiveStreamTask,
RegisterStreamTask.
server ip address is fixed.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Butterfly_JavaCV/src/com/butterfly/MainActivity.java
Merge branch 'master' of https://github.com/ButterFly-Broadcast/butterfly.git