ignore some directories
modified .gitignore for cbegin.com
a new file added
add age to account and profile page
Merge branch 'account_age' into develop
add age to account and profile pages
ignore cache in uc_client
ignore cache in uc_client
modified .gitignore
added directory data/lang
Merge branch 'fixbug-PUBLIC_AGE' into develop
Merge branch 'develop'

Conflicts:
	.gitignore
cc
dd
industry
ss
Merge branch 'master' into develop
fixed variable conflict in javascript
Merge branch 'develop'
update for industry