Small version of icons
Merge branch 'origin/master'

Conflicts:
	Code/src/TimeManager/TimeManagerView.java
Merged with sercan's new layout in add area