Merge branch 'mongodb' of https://github.com/n2cms/n2cms
Added support for consistent URL enforcement.
james, please be so kind and test changes I introduced: GetSitesSource - root content items doesn't have ISiteSource GetPreferredUrl - null ISiteSource case, null or empty site.Authority cases, support for Site.HttpsRequired proposed (TODO) ApplicationInstance_AcquireRequestState Don't redirect N2 default.aspx ASP.NET helper (will create an endless loop) Regards, JH
Fix whitespace
Merge branch 'master' of https://github.com/DejanMilicic/n2cms
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from n2cms/master

Please catch up with master so your pull requests don't conflict
Merge branch 'master' into safe-url-handling
Added default classes for 2-column bootstrap3
Added default classes for 3-column bootstrap3
Ignore columns on mobile devices

Still using 'sm' columns so we get 3 columns whenever reasonably possible.
Update TwoColumns.cshtml
Add LinkHref property to ImageFloat

view diff with ?w=1 to ignore the extensive whitespace changes
(whitespace)
(whitespace)
Merge pull request #409 from n2cms/safe-url-handling

Safe url handling
Refactor code, clean up ContentItem
Merge branch 'master' of github.com:n2cms/n2cms

Conflicts:
	src/Framework/N2/ContentItem.cs
Merge branch 'Upstream/master'
Date picker is now using id instead of class name for initialization