change to proper app key and client key for Javascript
Merge branch 'master' into working_jack
added cloudcode, also implemented basic way to get friend's activities
Merge branch 'master' of https://github.com/tsai0606/loocup
minor adjustment to fit with cloudcode on newsfeed stuff
changing cloudcode and adjust local newsfeed code
Merge remote-tracking branch 'origin/connie1'
try to merge connie1 to master
merge master