Updated gui
Merge branch 'master' of https://github.com/xebia/xtime-ios

Conflicts:
	xtime-ios/xtime-ios/ViewController.swift