Squashed commit of the following:
Squashed commit of the following:

commit 6ae1f58c634363f00479d4cb174d16a7f3343846
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Tue Feb 18 21:06:48 2014 +0100

    ehm, form needed here...

commit 8efdc008018a5f9462b0161a3da196a60b01e496
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Sun Feb 9 09:56:13 2014 +0100

    use constructor for this

commit 96061614fb3d614308e1051985a26f460df89b8a
Merge: b765821 6ef824b
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Sun Feb 9 09:55:06 2014 +0100

    Merge branch 'staging' of ssh://dev.sensimedia.nl/home/git/libraries/monolyth into staging

    Conflicts:
    	info/meta.ini
    	info/sql/pgsql.dbmover.sql

commit 6ef824bc27574dca711d1eaff1523e6b61822595
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Thu Feb 6 10:44:15 2014 +0100

    hm, this should work slightly diffently in append-mode

commit 81023a0517f9e1d03d7586227e73979571d04f29
Merge: b6b336c 90aa2a0
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Wed Feb 5 16:57:36 2014 +0100

    Merge branch 'staging' of ssh://dev.sensimedia.nl/home/git/libraries/monolyth into staging

commit b6b336cb48beaa7988191464ac0cc0d63092b47d
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Wed Feb 5 16:56:37 2014 +0100

    new pass form

commit 73788cd2de9677fb24666d15eff360fee90000b3
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Wed Feb 5 16:56:32 2014 +0100

    new pass controller

commit f9aa2dae31fba6b637714fc20126e81c94b31207
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Wed Feb 5 16:56:22 2014 +0100

    texts

commit e016491ad0abcff8dee24c7ae961c448d29986f8
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Wed Feb 5 16:56:15 2014 +0100

    if not set, this is automatically successfull

commit 88fa70c32d35363ad59ddf3a673da88ce4dcf880
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Wed Feb 5 16:56:00 2014 +0100

    slightly different logic here - after resetting, we want the user to choose a new password

commit fe4df2e1e736cb5b8b83ba1c0725205302d634cb
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Wed Feb 5 16:40:10 2014 +0100

    use correct form name

commit 90aa2a04ea45f8fe3dfd9c4df7a004ae0d1a4364
Merge: 73ba7a2 13cdc1c
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Wed Feb 5 13:43:36 2014 +0100

    Merge branch 'staging' of ssh://dev.sensimedia.nl/home/git/libraries/monolyth into staging

commit 73ba7a248445b99a1a4ff3e0ef1e870e34cf9f51
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Wed Feb 5 13:38:16 2014 +0100

    ugh, i was not always consistent in naming these...

commit 13cdc1c1588e8b4d91ce52e123a89320a83fe384
Merge: b37ad05 1ac1a46
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Tue Feb 4 18:37:09 2014 +0100

    Merge branch 'staging' of ssh://dev.sensimedia.nl/home/git/libraries/monolyth into staging

commit b37ad051510f9c0c017034806f1d6c052b4ab3cc
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Tue Feb 4 18:33:45 2014 +0100

    make sure these all lazy-load. todo: rewrite pdo to a function to handle this even better

commit 1ac1a4671b18041a3037e65f3a58b4ad916f9c2a
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Tue Feb 4 17:17:09 2014 +0100

    allow for placeholders to be defined, which will be removed if we get content back (i.e., "no comments yet" style messages)

commit 8d0775694a55319eb69314285ba33e451d203b8e
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Tue Feb 4 17:03:46 2014 +0100

    older and wiser... this works much better now

commit 8406a35fa981c5e28ecd40a31dc91f04716f319a
Merge: 607b6d6 6d0c039
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Tue Feb 4 16:30:08 2014 +0100

    Merge branch 'staging' of ssh://dev.sensimedia.nl/home/git/libraries/monolyth into staging

commit 6d0c0395c50294a21c1fe8528baa95f96de394c2
Merge: 3f04f3f 2804bbc
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Tue Feb 4 16:22:32 2014 +0100

    Merge branch 'staging' of ssh://dev.sensimedia.nl/home/git/libraries/monolyth into staging

commit 3f04f3f7650a4a789fe914653aa95fc5ba0f688c
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Mon Feb 3 16:57:10 2014 +0100

    this is provided by url_helper

commit e7a75e816f90dbefb8d3158e9a08592e62097300
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Mon Feb 3 16:56:56 2014 +0100

    modernize

commit dba4b5a3d97b4c8906eb4a93165bb4fcad5a76dc
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Mon Feb 3 14:44:36 2014 +0100

    oops, this has become a singleton

commit 2804bbcfaf77676f8eff350aacd39baa1135e471
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Mon Feb 3 11:02:12 2014 +0100

    inject project

commit 9bc6004a4db4151422c5ba786d0b6171f3f22dd3
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Mon Feb 3 10:34:40 2014 +0100

    project should be injected via the constructor

commit bfba3d869727233d6ba807ca1809bc06ff67e94b
Merge: ede3bf6 95c7325
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Mon Feb 3 10:13:19 2014 +0100

    Merge branch 'staging' of ssh://dev.sensimedia.nl/home/git/libraries/monolyth into staging

commit ede3bf64432805c28ecfa882e277eea23c22859f
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Fri Jan 31 15:19:44 2014 +0100

    cleanup

commit 607b6d615a0dd1d4ef1f07a569cad72aba72b2f6
Merge: 6da3820 4dfe009
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Tue Jan 28 18:12:13 2014 +0100

    Merge branch 'staging' of ssh://dev.sensimedia.nl/home/git/libraries/monolyth into staging

commit 6da3820546ce2a9453f1e1b1c9022767671e55d7
Merge: ebc7b12 18cd521
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Fri Jan 24 18:33:04 2014 +0100

    Merge branch 'staging' of ssh://dev.sensimedia.nl/home/git/libraries/monolyth into staging

commit ebc7b1203a68e6a886671473052191c991c0b6c9
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Fri Jan 24 18:20:15 2014 +0100

    modernize

monomelodies/monolyth,monomelodies/monolyth