added edit profile
Merge branch 'master' of git://github.com/Groarq/tablica into moonrise
conflict
conflict
conflict