Merge branch '1.8' of gitorious.org:lorea/html5 into 1.8

Conflicts:
	views/default/page/elements/foot.php
	views/default/page/elements/owner_block.php

diff --cc views/default/page/default.php
Simple merge

diff --cc views/default/page/elements/footer.php
Simple merge

diff --cc views/default/page/walled_garden.php
index 1075ea811d9caa1a3c556b07b87c9945676e828e,26d1235c2985d41bd3adac7b4be6d4c192c74bfe..c12a7203d5f764ed1a37f6c8519c19f1ecf864cd
--- 1/views/default/page/walled_garden.php
--- 2/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@@ -3,10 -3,14 +3,16 @@@
   * Walled garden page shell
   *
   * Used for the walled garden index page
 + * 
 + * @override views/default/page/walled_garden.php
   */
  
+ $is_sticky_register = elgg_is_sticky_form('register');
+ $wg_body_class = 'elgg-body-walledgarden';
+ if ($is_sticky_register) {
+       $wg_body_class .= ' hidden';
+ }
+ 
  // Set the content type
  header("Content-type: text/html; charset=UTF-8");
  ?>

diff --cc views/default/search/search_box.php
Simple merge