merged changes from stable into beta

docs/contributing.rst

@@ -17,6 +17,14 b' please send me a pull request.'
 To run RhodeCode in a development version you always need to install the tip
 version of RhodeCode and the VCS library.
 
+after downloading RhodeCode make sure you run::
+
+    python setup.py develop
+
+command to install all required packages, and prepare development enviroment
+
+
+
 | Thank you for any contributions!
 |  Marcin
 

docs/theme/nature/layout.html

@@ -10,5 +10,9 b''
 	border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 	<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
 	</form>
+    <div style="padding:5px">
+     <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank">
+     <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a>
+   </div>  
 </div>
 {% endblock %}}

rhodecode/lib/__init__.py

@@ -232,9 +232,6 b' def safe_str(unicode_, to_encoding=None)'
     :returns: str object
     """
 
-    if not isinstance(unicode_, basestring):
-        return str(unicode_)
-
     if isinstance(unicode_, str):
         return unicode_