sync
Merge branch 'master' of https://github.com/kakaranet/games
add discard button; remove sync module
Merge branch 'master' of https://github.com/kakaranet/games
add dropbox sample
Merge branch 'master' of https://github.com/kakaranet/games
now macroses ?INFO and ?DBG disable by default for server app
for enable their you must add to make command line SV=1 for enable ?INFO or SD=1 for both ?INFO and ?DBG
if you want to use rebar, you must add -DSERVER_LOG_VERBOSE or -DSERVER_LOG_DEBUG respectively
sync
Merge branch 'master' of https://github.com/kakaranet/games

Conflicts:
	apps/face/src/index.erl