Merge tag '20140528055510' into develop

milestone: 20140528055510 20140528055510
new file added file-x
Merge pull request #6 from skangayam/develop

Develop