update project setting
add ignore file
update jdk to 1.7
update jdk to 1.7
Merge branch 'master' into develop