Merged revision(s) 1181-1185 from branches/ticket_691: Implementation of ticket #691
Implemented ticket #691 "Rework including logic"
Implemented most of ticket #691
Updated implementation for ticket #691
Deleted obsolete branch for ticket #714
Created branch for ticket #691
Implemented ticket #703 "Style fixup functionality"
Implemented ticket #714 Merged revision(s) 1166-1178 from branches/ticket_714:
Implemented ticket #714 "Strings should not be copied from variables as literals"
Intermediate commit for #714 Renamed is_file() and is_dir() and resolved a small issue