Cleared bin&gen folders
Added bin&gen into .gitignore
Updated amap key
Added bin&gen into .gitignore
Merge branch 'devByColin' into development