Latest changes from charanjit
Merge branch 'master' of github.com:pradeepnarava/tfh_latest
merging after conflicts
Conflicts:
	CalendarView.xib
	Plusvecka.xib
	PlusveckaCalenderView.xib
	RegiDinaveckarDayCalendarView.xib
	RegiDinaveckarDayCalendarView_iPhone4.xib
	RegistreringDinaveckaView.xib
	Registreringsvecka.xib
	SettingRegistView.xib