Artit20140613

Recommit edit roll back source