Code optimization
minor fixes
Calendar implementation started
Calendar Implementation
Calendar
 -
Maps
Merge remote-tracking branch 'Github/master' into Development

Conflicts:
	Podfile.lock
Merge pull request #18 from stephensilber/Development

Development