fixed issue that caused bad redirect using  when the Images controller was used - relates to Issue#417
Update modified, modified_by, and deleted_by fields

in update_batch, update_where, and delete_where.
Fix for #559
Merge branch 'develop' of https://github.com/ci-bonfire/Bonfire into develop
Merge branch 'develop' of https://github.com/ci-bonfire/Bonfire into develop
Assets::clear_cache() also delets the index.html file; this puts it back in after deleting the cache
users auth: dos2unix

Change line endings in one file from dos to unix style.  Split out of a
3-line patch (to follow), in order to maintain clean history.

Git core is binary-safe.  However, multiple committers are apparently
not using line-ending agnostic environments like KDE.  (Personally,
my editor works that way, but I could do without the ugly ^Ms in
git-diff).

GitHub recommends using Git features which store unix-style line endings
internally, but allow automatic conversion on checkout.  Configuring the
automatic conversion is on my TODO list :).

https://help.github.com/articles/dealing-with-line-endings
Error attempting to use auth->role_name_by_id()

When attempting to use auth->role_name_by_id(), the library throws an
error, attempting to call method select on a non-object. Fixed by
checking to see if the Role_model class exists and, if not, loading it.
dos2unix, i.e. normalize line endings, using gitattributes

Git core is binary-safe.  However, multiple committers are understandably
not using line-ending agnostic environments like KDE.  (Personally,
my editor works that way, but I could still do without the ugly ^Ms in
git-diff).

.gitattributes recommended by Github [1]

Conversion commands suggested by updated Stack Overflow answer [2]

    $ rm .git/index     # Remove the index to force git to
    $ git reset         # re-scan the working directory
    $ git status        # Show files that will be normalized
    $ git add -u

[1] https://help.github.com/articles/dealing-with-line-endings#platform-all
[2] http://stackoverflow.com/a/4683783/799204
Merge pull request #563 from mwhitneysdsu/develop

Update modified, modified_by, and deleted_by fields
Merge pull request #570 from tricinel/develop

Fixes #471 on the Image controller
fixed issue that caused bad redirect using  when the Images controller was used - relates to Issue#417
Assets::clear_cache() also delets the index.html file; this puts it back in after deleting the cache
Fix 2 delete buttons when translated into non-english language

    if ($action = $this->input->post('submit')) {
        if ($action == 'Delete') {

The value of an button-type input is the same text displayed to the user,
so the above code won't work when a non-English language is selected.
Change this to the approach developed
builder: fix old filename (modulebuilder_lang.php) for persian translation
Remove 5 redundant translations e.g. lang('mb_delete')

We can use lang('bf_action_delete') instead.

bf_action_delete   mb_delete
bf_actions         mb_actions, permissions_actions (wasn't used anyway)
bf_cancel          permissions_cancel
bf_username        bf_username (duplicate)
users module: resend_activation(): validation message: translate 'Email'
Merge branch 'lang' into develop
Updating the Features and Team members
Moving the version to 0.6
Updating the changelog