local changes
added src/.kdev_include_paths
Merge branch 'master' of https://github.com/lk16/squared

Conflicts:
	src/.kdev_include_paths
	src/CMakeLists.txt
	src/bots/bot_ali.cpp
removed clickable_image.cpp from CMakeLists.txt
Merge branch 'master' of https://github.com/lk16/squared

Conflicts:
	src/bots/bot_ali.cpp
Merge branch 'develop' of https://github.com/lk16/squared

Conflicts:
	src/bots/bot_ali.cpp
removed mask local var from board::do_move
moved board::is_valid_move and board::undo_move to header file
returning valid moves instead of writing to pointer argument in board::get_valid_moves()
board::undo_move now takes undo_data by value
replaced all calls to board::do_move by a new version of it that returns the undo data instead of writing to an argument pointer