20140427_2 new file commit
Merge branch 'release/release2'