Done new UI
Change class design
Merge branch 'master' of https://github.com/ie-ModelingAndDesign/2013-N

Conflicts:
	JungleTimer/JungleTimer/Base.lproj/Main.storyboard
	UML/JungleTimerUML.asta
	UML/JungleTimerUML.asta.bak