Development to master merge.

In such simple project using final ints doesn't seem bad solution. But it's much better to use enums in this case. Refactoring, searching for specific enumerations becomes easier.

Good example how enums with initialization works: http://stackoverflow.com/a/3990421/2776623