Merging 1.8/develop into 1.7/master

commit 0a00b184d8c4a78644a095d11702a405b2e494f7
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Jul 12 11:32:42 2014 +0200

    fixed use of incorrect variable

commit 3046cca1d90728d1d3dddcc418e07a84e32f0119
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Jul 11 19:15:35 2014 +0200

    syntax correction

commit d4150edcfd0a71749adb44d9558fd6b947e39f6b
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Jul 11 19:15:27 2014 +0200

    fix the view path so generated code works cross OS; closes #230

commit 05c00be3f2d1f0858f079ba8362bc63dc0292f69
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Mon Jul 7 23:00:20 2014 +0200

    don't crash on non-existing commands, but show a list of the
available ones

commit 70b51f74cbc87e8b6bfe46060fbe1c019323d627
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Sat Jun 14 14:07:59 2014 +0200

    updated the generator to generate presenters instead of viewmodels

commit a1e423b065d05121ab9a93b9fe14cbe40cec164a
Merge: ea9dd0f a4e97dc
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sun May 11 20:45:23 2014 +0200

    Merge pull request #229 from kenjis/oil_test_debug

    Add --debug option for oil test

commit a4e97dcb327d2cd6d3c21d03c3a1aaefbfe390b4
Author: kenjis <kenji.uui@gmail.com>
Date:   Thu May 8 07:02:34 2014 +0900

    Add --debug option for oil test

    Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>

commit ea9dd0f6cd9a713315d0a645f7b0767b0e727e35
Merge: dc82ccd 3e63664
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Wed May 7 21:29:58 2014 +0200

    Merge pull request #220 from sagikazarmark/1.8/develop

    Added support for generating nestedset and temporal model

commit 3e63664420a12a4edbe4533b99c4520e487d526f
Author: Sági-Kazár Márk <mark.sagikazar@gmail.com>
Date:   Wed May 7 15:46:28 2014 +0200

    Adds newline

commit b67f8b8404a291ae127362cac7716e8ee33ff0d8
Author: Sági-Kazár Márk <mark.sagikazar@gmail.com>
Date:   Wed May 7 15:19:29 2014 +0200

    In case of temporal and nestedsets no_timestamp defaults to true

commit 32c4e006471f2cbdce6e214d2dbd111a5d2566bc
Author: Sági-Kazár Márk <webmaster@firstcomputer.hu>
Date:   Thu Dec 5 14:13:03 2013 +0100

    Nestedset added support for read_only fields

commit 9baf823cabdbb3c70221c5e1a8b95813780ae11c
Author: Sági-Kazár Márk <webmaster@firstcomputer.hu>
Date:   Thu Dec 5 13:46:35 2013 +0100

    Title and tree-id are now optional, have to be passed in cli (Model
Nestedset)

commit fb720f430fef9bedbacb9eba45a54f34d23076e9
Author: Sági-Kazár Márk <webmaster@firstcomputer.hu>
Date:   Thu Dec 5 13:26:32 2013 +0100

    Change in order of new lines

commit 1ffee39f340bea677b969d67888edeaab54e1b81
Author: Sági-Kazár Márk <webmaster@firstcomputer.hu>
Date:   Thu Dec 5 13:17:36 2013 +0100

    Nestedset copy&paste fix

commit ce98b003757435581a8a5364793ed99e5f5780cc
Author: Sági-Kazár Márk <webmaster@firstcomputer.hu>
Date:   Wed Dec 4 03:46:02 2013 +0100

    Primary key added to temporal model, model definitions generated
better

commit 7b8ade5b99bc44bad6e480f8cd0915569c9e3836
Author: Sági-Kazár Márk <webmaster@firstcomputer.hu>
Date:   Wed Dec 4 02:57:50 2013 +0100

    Model types moved out of no timestamp option

commit bb6ff6e1b3ef022fc44bad1dad5eee2a4a7c4265
Author: Sági-Kazár Márk <webmaster@firstcomputer.hu>
Date:   Wed Dec 4 02:24:53 2013 +0100

    Add special temporal and nestedset model fields to the head of
properties

commit c4a1f1c48ba01a42476636f8623c638bc7b8b90c
Author: Sági-Kazár Márk <webmaster@firstcomputer.hu>
Date:   Wed Dec 4 02:00:04 2013 +0100

    Added nestedset model generation without primary keys

commit 4e1c2948bebf7dba4087ab073b131cf274634e04
Author: Sági-Kazár Márk <webmaster@firstcomputer.hu>
Date:   Wed Dec 4 01:34:09 2013 +0100

    Variable name mistype caused by copy&paste

commit a0b5ab0bb7397081ffa31791d7872ad357f142e6
Author: Sági-Kazár Márk <webmaster@firstcomputer.hu>
Date:   Wed Dec 4 01:31:43 2013 +0100

    Added temporal model generation without primary_key

commit dc82ccd6c97dc90335626c1be20e888112d817fe
Merge: dcbae2c f831ec9
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Mon Apr 28 08:38:15 2014 +0200

    Merge pull request #225 from kenjis/fix_controller_template

    Fix coding style of generated controllers by scaffold/admin

commit dcbae2c6117d061f9673101873ff0e26e40f99c2
Merge: d458c04 09bc0e6
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Thu Apr 24 23:06:24 2014 +0200

    Merge pull request #228 from Art4/patch-1

    Add support for --testsuite testing

commit 09bc0e645e9d87fe00d05a7ad00878bb3f0b4f56
Author: Art4 <Art4@users.noreply.github.com>
Date:   Thu Apr 24 20:16:40 2014 +0200

    Add support for --testsuite testing

commit f831ec9347e8aba9c73dbd13c4bf72846cc27036
Author: kenjis <kenji.uui@gmail.com>
Date:   Sat Apr 12 17:00:57 2014 +0900

    Fix line endings to be LF

    Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>

commit 5118389c793c446244cf57c76e3b2eb601fb7d6a
Author: kenjis <kenji.uui@gmail.com>
Date:   Tue Apr 8 11:35:41 2014 +0900

    Fix coding style of generated controllers by scaffold/admin

    Signed-off-by: kenjis <kenji.uui@gmail.com>

commit d458c04cc0e66ef42558bd60ef41681a18a33c9c
Merge: 0046712 6af6b79
Author: Frank de Jonge <FrenkyNet@users.noreply.github.com>
Date:   Mon Apr 7 09:20:58 2014 +0200

    Merge pull request #224 from kenjis/fix_typo

    Fix typo in views/admin/login.php template

commit 6af6b799bc3b9132671fb62e27aeab045af7d363
Author: kenjis <kenji.uui@gmail.com>
Date:   Mon Apr 7 16:06:45 2014 +0900

    Fix typo in views/admin/login.php template

    Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>

commit 0046712754f4c623b58e95f11d1447dc79dad536
Merge: a64114b 7128977
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Sun Feb 16 13:53:49 2014 +0100

    Merge pull request #223 from tresbach/1.8/develop

    rename css class "alert-error" to "alert-danger"

commit 7128977ba1bd551d085dff11c2092a09cdeec063
Author: Amanda Tresbach <altfga@gmail.com>
Date:   Fri Feb 14 18:50:11 2014 -0200

    rename css class "alert-error" to "alert-danger"
    the former was deprecated in Bootstrap 3

    Signed-off-by: Amanda Tresbach <altfga@gmail.com>

commit a64114be98a790aeedaba3769363744195b591da
Merge: b53ee74 8112483
Author: Harro Verton <wanwizard@wanwizard.eu>
Date:   Fri Feb 14 17:49:11 2014 +0100

    Merge pull request #222 from philipptempel/patch/module_support

    Add module support to oil

commit 81124838f72ab762068a542dff3f703727f765ac
Author: Philipp Tempel <phtempel@gmail.com>
Date:   Tue Feb 11 18:15:35 2014 +0100

    Update generate::module to check for an arg (module name)

    If none is given, an exception is thrown

    Signed-off-by: Philipp Tempel <phtempel@gmail.com>

commit 1003289dfa51955d2363b32ae153bce07bc108b3
Author: Philipp Tempel <phtempel@gmail.com>
Date:   Tue Feb 11 18:05:31 2014 +0100

    Update PR to match Fuel's coding standards

    Signed-off-by: Philipp Tempel <phtempel@gmail.com>

commit a93b5699a9defcfe142f00a2bfdbd330ae3b8b2b
Author: Philipp Tempel <phtempel@gmail.com>
Date:   Sun Jan 19 16:09:06 2014 +0100

    Add module support to oil

    Patch adds module support for (as of now) the following oil commands
    * ```oil g controller```
    * ```oil g model```
    * ```oil g migration```
    * ```oil g task```
    * ```oil g views```

    Furthermore, a new oil generate command ```oil g module``` is added
to allow for creating modules with an additional option ```--folders=```
to automatically create specified folders.
    Example usage

    ```
    oil g module portfolio
--folders=classes/controller,classes/model,config,lang
    ```

    ```oil g module``` also checks whether the app has configured
multiple module paths as in config ```module_paths``` and gives a nice
select prompt if there's more than one module path defined

commit b53ee74d4dda186b55f0a2bb1c635c8d4f2ab610
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Dec 27 13:07:25 2013 +0100

    bumped the copyright to 2014

commit 3a7a2916ce13dd24c1aa591129d9d188202a57a2
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Fri Dec 20 15:47:35 2013 +0100

    fixed auth config file not loaded when fetching the driver name

commit a540cd747367a090a9e75ce5c4d2a101e4340a41
Author: WanWizard <wanwizard@wanwizard.eu>
Date:   Thu Dec 5 23:40:14 2013 +0100

    added inline help for the "oil server" command