Merge branch 'master' of /home/ongkrab/BMB2014 with conflicts.
Merge remote-tracking branch 'origin/master'
[#54496148] add Organizer page , edit home index page ,Add file for user can download.
Merge remote-tracking branch 'origin/master'