Merge pull request #4 from longjunye/master

solved conflicts
add coupon page
and changes
solve conflicts
merge all the change until now
add splash activity