fi
Merge branch 'master' of github.com:netjet/FlatUITheme

Conflicts:
	styles/widgets/circle-chart.less
fox