Merge pull request #5 from sandyshady/master

changed view files
heartbeat completed
Merge remote-tracking branch 'origin/master'
sos rating done
ckeditor files deleted
pink up done
view updated 5feb
conflict solved in pinkup'

clear
pinkup & edit views done