Fixed upgrade guide link and license date
Show missing template name.
Update form_validation_lang.php

Added missing translation pairs
Update database.php.bak
Merge pull request #2673 from khalil-tabbal/2.2/develop

2.2/develop : french translations
Merge pull request #2669 from RaveX/patch-1

Update database.php.bak
Resolved conflict in datetime's default input_type
Add keyword searching to Files module in Admin controller
Optimized get_tagged method

Removed unneeded code.
Only use one query and no more silly array iterations.
Optimized $.ajaxSetup code and oddities
Adding ability to set a stream in the template library.

When setting a stream in the template library, basically you are
telling Pyro to use the stream parser to process the view. The stream
parser goes in and modifies tags to make things like multiple relations
work (ie, tags with parameters). To see a working exampl, see the blog
module.
Adding stream parse support to the blog

This sets up the blog to use our special streams parse function to
parse blog content, allowing tags with parameters.
Fixing issue with passing rows in streams parse

Passing the row_id as `row_id=id` was causing problems when it was
inside of a variable loop. Changing it to `row_id="{{ id }}"` helps,
however, we now have to deal with variable naming collisions for
overriden stream variables that are not inside tag loops. This is a Lex
issue, however, so it should be fixed in Lex.
Stopping the cellspacing="0" madness
Merge pull request #2683 from ryun/patch-6

Optimized $.ajaxSetup code and fixed syntax oddities
Added a subtle indicator that a page is draft on the pages index. Fixes #2679
Merge pull request #2677 from ryun/patch-5

Optimized get_tagged method
Update global_lang.php
Merge branch 'feature-search-keyword' of git://github.com/pickupman/pyrocms into 2.2/develop
Fixed issue with search result not being highlighted in Files