refs #514: version tag modified
refs #514: bugfix: merging process created error.
refs #514: bugfix: upstream causes name confliction of JQUERY external path. modified.
refs #514: version tag modified
refs #514: year tag modified (master)
refs 607: bugfix: broken merges
 refs #1629 : Security message added.

 - Instuction to change permission with command.
 refs #1628 : privte comment added.

 - Private comment checkbox added
 - Behavior checking / design confirmation is needed.
refs #1626: bugfix: change code to match webslice function
 refs #1604 : bugfix : remove unused link at title.
 refs #1563 : modify EAS plugin to use FAS
 refs #1627 : bugfix: mysql_escape_string when disconnected.

 - Before MySQL connection, escapeString uses mysql_escape_string.
   First escapeString call happens when TC loads default blog
   settings from pageCache.
   For next versions, we strongly recommend using MySQLi adapter.
   (mysql will be deprecated after PHP 5.5)
refs #1612 : enhanced: routine to calculate next versions.
 refs #1569 : bugfix: strip ' of location tag.
 refs #1468 : bugfix: alert when line is too long.
 refs #1494 : bugfix:introduce call_user_func_array

 - sending reference as array using call_user_func_array.
 refs #1631 : bugfix - mobile page print blank page

 - Conditional statement to check the pagination condition.
Merge pull request #1632 from Needlworks/2.0

Merge 2.0 changes into trunk.
refs #1630:
 - remove strict warnings for static method calls which are not defined
   as static (if method bodies do not include `self` or `$this`, they
   should be defined as static!)
 refs #1630 : bugfix - remove deprecated functrion.

 - Changed deprecated mysqli-related function in mysqli debug to be compatible with PHP
 5.5