1 Jan 2014 Hotfixes and Edits

Changing UX with Bassem
Merge branch 'master' of github.com:tsheasha/SkillAcademy
Hotfixes 7
Fixed Conflicts
Hotfixes 8
Merge branch 'master' of github.com:tsheasha/SkillAcademy
Hotfixes 9
Merge branch 'master' of github.com:tsheasha/SkillAcademy
Hotfixes 10
Merge branch 'master' of github.com:tsheasha/SkillAcademy
Merge pull request #22 from karimnaguib/master

2 Jan 2014 (2)
Merge pull request #23 from tsheasha/hotfix

Hotfix