Add some functional
Merge remote-tracking branch 'origin/master'

Conflicts:
	Notes/src/ru/nsu/fit/bukshev/notes/EditActivity.java
	Notes/src/ru/nsu/fit/bukshev/notes/Main.java
	Notes/src/ru/nsu/fit/bukshev/notes/MainListActivity.java