refactored issue mxit money to users
fix facebook login
set default values for enviroment variables in test mode
update travis.yml
remove notice from home page
remove left behind spec
add compile assets
update puma
coveralls enabled only on travis
Update README.md
updated to new shinka api
updated puma gem
fix shinka ad_helper
use javascript version of smaato ads
removed ad showing spec
set user credits to 18 everyday
Add Travis badge
Coveralls.wear!('rails')
fix redeem_winnings_spec
Merge branch 'master' into badges

Conflicts:
	app/helpers/ad_helper.rb
	db/schema.rb