Fixed buttons
Merge branch 'master' of http://github.com/meet-projects/tobecontinued-y2-2013