Merge branch 'master' into imp_6_1

Conflicts:
	framework/Imap_Client/package.xml
	imp/docs/CHANGES
	imp/lib/Application.php
	imp/package.xml
Fix method name
Merge branch 'master' into imp_6_1

Conflicts:
	imp/package.xml
Remove merge artifact
Clean up some unused variables
Merge branch 'master' into imp_6_1

Conflicts:
	imp/package.xml
Hidden session ID data no longer needed.

Session data is available either as part of form URL or in cookie.
[mms] All Ingo templates now use Horde_View.
Merge branch 'master' into imp_6_1
condense if statement; phpdoc
Added simple jsmin test
Merge branch 'master' into imp_6_1
[mms] Initialize viewport and mailbox list in single AJAX call when initially loading the dynamic mailbox view.
Remove 'ask' option for the 'request_mdn' preference
Merge branch 'master' into imp_6_1

Conflicts:
	imp/package.xml
Merge branch 'master' into imp_6_1

Conflicts:
	imp/docs/CHANGES
	imp/lib/Application.php
	imp/lib/Dynamic/Compose/Common.php
	imp/package.xml
Merge branch 'master' into imp_6_1

Conflicts:
	imp/package.xml
phpdoc
Optimize tokenizer
Merge branch 'master' into imp_6_1

Conflicts:
	imp/lib/Dynamic/Compose/Common.php
	imp/package.xml