Merge branch 'lorea-preprod'

Conflicts:
	.gitmodules

diff --cc .gitmodules
index 31347f96a55f7d299745b8de26fbd7125ac2688b,1741dec911d2faf86cd11e3a198ab24e6888997b..da687ced6e6c0087341cbddf4b06a820e4756d0f
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -76,9 -76,6 +76,9 @@@
  [submodule "mod/simple_faq"]
        path = mod/simple_faq
        url = git://gitorious.org/lorea/simple_faq.git
- [submodule "mod/purity_theme"]
-       path = mod/purity_theme
-       url = git://gitorious.org/lorea/purity_theme.git
+ [submodule "mod/river_privacy"]
+       path = mod/river_privacy
+       url = git://gitorious.org/lorea/river_privacy.git
 +[submodule "mod/habitorio_theme"]
 +      path = mod/habitorio_theme
 +      url = git://gitorious.org/lorea/habitorio_theme.git

diff --cc mod/infinite_scroll
index 96bdef76f1e3c27e392373b8152d471c88f46b8f,0b5e837358e3bc0e23261b414509383a0eb617f8..d02673c94cace52bea4d1debd6a2c594a6ccfbaf
--- 1/mod/infinite_scroll
--- 2/mod/infinite_scroll
+++ b/mod/infinite_scroll
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 96bdef76f1e3c27e392373b8152d471c88f46b8f
 -Subproject commit 0b5e837358e3bc0e23261b414509383a0eb617f8
++Subproject commit d02673c94cace52bea4d1debd6a2c594a6ccfbaf

diff --cc mod/videolist
index d2b3600e49bfac698042e39e6b6ac79124b1080e,d2b3600e49bfac698042e39e6b6ac79124b1080e..b214b13fd4ef49ec2d8c6db486f30d6d9d8841ec
--- 1/mod/videolist
--- 2/mod/videolist
+++ b/mod/videolist
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit d2b3600e49bfac698042e39e6b6ac79124b1080e
++Subproject commit b214b13fd4ef49ec2d8c6db486f30d6d9d8841ec

diff --cc views/default/forms/register.php
index 75ecd34504176c650197336acdd38bc90c653ad9,75ecd34504176c650197336acdd38bc90c653ad9..c0ee66f76e1b00be81bdb0db0cf550c814482b65
--- 1/views/default/forms/register.php
--- 2/views/default/forms/register.php
+++ b/views/default/forms/register.php
@@@ -6,6 -6,6 +6,8 @@@
   * @subpackage Core
   */
  
++elgg_load_js('elgg.register');
++
  $password = $password2 = '';
  $username = get_input('u');
  $email = get_input('e');