Caption managment reworked

[Lanaya97]

Abandon the old pull request please and accept this one, I think the conflict is only DevExpress version difference but I'm unable to resolve them here.

[Suprcode]

it looks like you might be out of sync with the latest branch - trying pulling latest and submitting again.

any .bak files should be deleted, and theres a few other parts submitted that need reverting first before i can accept the commit.

[Lanaya97]

@Suprcode check last commit please.

[Suprcode]

@Lanaya97 I don't see anything new? Also it's still advising that there are conflicts.

[Lanaya97]

Strange, in the last commit I deleted all the files except .cr/personal or not sure of it's name.

[Lanaya97]