Glyphicons changes

Signed-off-by: Matt White <matthew.white@fclonline.com>
Working on #314

Signed-off-by: Matt White <matthew.white@fclonline.com>
Working on #314

Signed-off-by: Matt White <matthew.white@fclonline.com>
no
Working on #314

Signed-off-by: Matt White <matthew.white@fclonline.com>
Merge branch 'master' of https://github.com/unplugged/unplugged-controls

Conflicts:
	AppProperties/database.properties
	CustomControls/unpNavigator.xsp
Merge remote-tracking branch 'controls_master/master'

Conflicts:
	AppProperties/database.properties