C0mm1T^
Merge + DIZ
change user diz
profile
Merge branch 'origin/master2'
ПК
верст глав, изм ава
home & upload i ewe 4e to
Merge branch 'origin/master2'

Conflicts:
	application/modules/id/views/friends_view_form.php
	application/modules/id/views/news.php
	application/modules/id/views/red_audio.php
	application/modules/id/views/statistic.php
	application/modules/id/views/view_audio.php
добавил циферки в комменты))