Merged Quang's Branch to Master containing the updated js and css
refactored files

Quang Nhan
16/08/2014