local changes
more local changes
Merge http://github.com/lk16/squared

Conflicts:
	src/bots/bot_ali.cpp
	src/bots/bot_ali.hpp
	src/game/game_control.cpp
	src/game/game_control.hpp
	src/gui/main_window.cpp
	src/gui/main_window.hpp
	src/gui/scaling_image.hpp
	src/gui/settings_dialog.cpp
	src/gui/settings_dialog.hpp
Added working executable file
Merge http://github.com/lk16/squared

Conflicts:
	src/bots/bot_ali.cpp
	working
changed default main_window size and bot ali heuristic
fixed bugs in bot_ali::alpha_beta_pefect