+
Merge remote-tracking branch 'origin/master'

Conflicts:
	Viciniti/src/com/svitla/viciniti/controllers/LogController.java