Merge branch 'mongodb' of https://github.com/n2cms/n2cms
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 'Upstream/master'
Date picker is now using id instead of class name for initialization
Merge pull request #418 from DejanMilicic/master

Date picker is now using id instead of class name for initialization