Merge branch 'master' of /home/thilini/Development/SITH/Sith with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
button are fixed