Merge branch 'develop' into feature/#24-license

# Conflicts:
#	AgileWorks/AgileWorks.xcodeproj/project.pbxproj
#	AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings
#	AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings
#	AgileWorks/AgileWorks/Strings/English.strings
#	AgileWorks/AgileWorks/Strings/Japanese.strings
#	AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings
#	AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings
#	AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings
#	AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings