--

Signed-off-by: Eugene Dimitrow <e.dimitrow@gmail.com>
Merge branch 'master' of https://github.com/dimitrow/Diploma

Signed-off-by: Eugene Dimitrow <e.dimitrow@gmail.com>

Conflicts:
	CarRent/Base.lproj/Main.storyboard
	CarRent/ClientViewController.h
	CarRent/ClientViewController.m
	CarRent/HistoryViewController.h
	CarRent/HistoryViewController.m