edit
Merge branch 'master' of https://github.com/tendaitt/KPlanner
Merge branch 'master' of https://github.com/tendaitt/KPlanner
minor fixes
Edit.java
merge'd the last pull
Edit.java
Merge branch 'master' of github.com:tendaitt/KPlanner