Merge branch 'postgres' into mongo

Conflicts:
	PROJECTNAME.cabal

Import.hs

@@ -14,6 +14,7 @@ import           Model                as Import
 import           Settings             as Import
 import           Settings.Development as Import
 import           Settings.StaticFiles as Import
+import           Data.Aeson           as Import (toJSON)
 
 #if __GLASGOW_HASKELL__ >= 704
 import           Data.Monoid          as Import

PROJECTNAME.cabal

@@ -42,21 +42,21 @@ library
 
     build-depends: base                          >= 4          && < 5
                  -- , yesod-platform                >= 1.1        && < 1.2
-                 , yesod                         >= 1.1        && < 1.2
-                 , yesod-core                    >= 1.1.2      && < 1.2
+                 , yesod                         >= 1.1.4      && < 1.2
+                 , yesod-core                    >= 1.1.5      && < 1.2
                  , yesod-auth                    >= 1.1        && < 1.2
                  , yesod-static                  >= 1.1        && < 1.2
                  , yesod-default                 >= 1.1        && < 1.2
                  , yesod-form                    >= 1.1        && < 1.3
                  , clientsession                 >= 0.8        && < 0.9
                  , bytestring                    >= 0.9        && < 0.11
                  , text                          >= 0.11       && < 0.12
-                 , persistent                    >= 1.0        && < 1.1
-                 , persistent-mongoDB            >= 1.0        && < 1.1
+                 , persistent                    >= 1.1        && < 1.2
+                 , persistent-mongoDB            >= 1.1        && < 1.2
                  , template-haskell
                  , hamlet                        >= 1.1        && < 1.2
                  , shakespeare-css               >= 1.0        && < 1.1
-                 , shakespeare-js                >= 1.0        && < 1.1
+                 , shakespeare-js                >= 1.0.2      && < 1.2
                  , shakespeare-text              >= 1.0        && < 1.1
                  , hjsmin                        >= 0.1        && < 0.2
                  , monad-control                 >= 0.3        && < 0.4
@@ -66,6 +66,7 @@ library
                  , directory                     >= 1.1        && < 1.3
                  , warp                          >= 1.3        && < 1.4
                  , data-default
+                 , aeson
 
 executable         PROJECTNAME
     if flag(library-only)

templates/homepage.julius

@@ -1 +1 @@
-document.getElementById("#{aDomId}").innerHTML = "This text was added by the Javascript part of the homepage widget.";
+document.getElementById(#{toJSON aDomId}).innerHTML = "This text was added by the Javascript part of the homepage widget.";