test js timestamp
Merge branch '2013campus'