Add gem mongoid-paperclip, activemerchant. Create model for advertiser, publisher, campaign, adv_item
Merge with master
Upload avatar in edit profile page
fix nav_link
update new nav item
Fill link in to publisher layout
add active class to left side menus
Show avatar in edit user form, fix the size of avatar for 70x70
Edit user changing password form
Merge branch 'create-model' of https://github.com/247DigitalGroup/click_lion into create-model

Conflicts:
	app/services/layout_detail/profile_layout_detail.rb
fix user avatar layout bug
Prevent user changing email, change password require current password
merge
merge with master
merge with master
Add new scenario test for devise mailer, related to confirm account feature
Merge branch 'create-model' of https://github.com/247DigitalGroup/click_lion into create-model
Enable capybara to see hidden elements on the page
Add cucumber test for edit user information: password, name, avatar
update minor