Testing fixes
Merge branch 'CombinationTime'

Conflicts:
	index.html
	less/_defaults.less
	less/_mixins.less