construction
Merge branch 'master' of https://github.com/igemsoftware/PoznanSoft2014
lighter black
Merge remote-tracking branch 'origin/circle'

Conflicts:
	Mufasa/Mufasa/Pages/Design.xaml
	Mufasa/Mufasa/Pages/Design.xaml.cs

aasda
Circle conflict resolved