danamir 0fce7ca1e9 Merge remote-tracking branch 'origin/dev' into dev ...

# Conflicts:
#	gui/second_page.py
#	main.py

2018-05-02 22:32:32 +03:00

..

second_page.py

Merge remote-tracking branch 'origin/dev' into dev

2018-05-02 22:32:32 +03:00