add jquery sorce map to assets to stop 404
Merge pull request #96 from luciddesign/bridgestreet

Bridgestreet
fix image switcher flicker (I think)
Merge branch 'master' of github.com:luciddesign/bootstrapify
fix image switcher flicker (I think)
Merge pull request #98 from luciddesign/bridgestreet

Another glitch in features loop
update navbar design settings
Merge branch 'master' of github.com:luciddesign/bootstrapify
highlight active links
3 or 4 columns on featured linklist
Merge branch 'master' into bridgestreet

Conflicts:
	theme/config/settings.html