Merge remote-tracking branch 'UnpluggedCustomControlsLibrary/dev/mark'
Removed Glyphicons from v1.8

Signed-off-by: Matt White <matthew.white@fclonline.com>
Update README.md
Update README.md
No Changes

Signed-off-by: Matt White <matthew.white@fclonline.com>
Upgraded to Controls 3.0

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

Conflicts:
	AppProperties/database.properties
	Code/ScriptLibraries/unplugged.js
	CustomControls/unpFlatView.xsp
	CustomControls/unpFlatView.xsp-config
	CustomControls/unpNavigator.xsp