update(layout)
Merge branch 'master' of https://github.com/dendht/Django

Conflicts:
	digester_ua_folder/digester_ua/digester_show_data.py
	digester_ua_folder/digester_ua/test2.py