Squashed commit of the following:

commit 72489e6e7aba3a543c55a2a39466aedee950ffde
Merge: 3cfcb2b 3fa6ca6
Author: Aliaksandr_Kazlou1 <Aliaksandr_Kazlou1@EPBYVITW0083.minsk.epam.com>
Date:   Wed Nov 26 04:35:09 2014 -0300

    Merge branch 'sources'

    Conflicts:
    	.gitignore
    	build.gradle

commit 3cfcb2b3474c5ed81c8a97c722bfd2d42cf1d0d4
Author: Aliaksandr_Kazlou1 <Aliaksandr_Kazlou1@EPBYVITW0083.minsk.epam.com>
Date:   Wed Nov 26 04:29:40 2014 -0300

    Build modify, add configs

commit 3185a31263bb578b25ee87608e38e07279a304b2
Author: unknown <Aliaksandr_Kazlou1@EPBYVITW0083.minsk.epam.com>
Date:   Tue Nov 25 17:39:43 2014 +0300

    Squashed commit of the following:
    Add sources, test merging commit
    commit 3fa6ca60b556991e0f7167d77a8a0c2b11139754
    Author: Aliaksandr_Kazlou1 <Aliaksandr_Kazlou1@EPBYVITW0083.minsk.epam.com>
    Date:   Tue Nov 25 10:59:01 2014 -0300

        Add new source
    commit 4f2054904badcc239e8a20fe5fc6a994b699252b
    Author: Aliaksandr_Kazlou1 <Aliaksandr_Kazlou1@EPBYVITW0083.minsk.epam.com>
    Date:   Tue Nov 25 10:57:16 2014 -0300

        Changes in build file

commit 3fa6ca60b556991e0f7167d77a8a0c2b11139754
Author: Aliaksandr_Kazlou1 <Aliaksandr_Kazlou1@EPBYVITW0083.minsk.epam.com>
Date:   Tue Nov 25 10:59:01 2014 -0300

    Add new sources

commit 4f2054904badcc239e8a20fe5fc6a994b699252b
Author: Aliaksandr_Kazlou1 <Aliaksandr_Kazlou1@EPBYVITW0083.minsk.epam.com>
Date:   Tue Nov 25 10:57:16 2014 -0300

    Changes in build file

commit a674f442ff20104ce9855ca1964767df7855a599
Author: AliaksandrKazlou <Aliaksandr_Kazlou1@epam.com>
Date:   Tue Nov 25 16:19:16 2014 +0300

    same
Merge branch 'master' of
https://github.com/AliaksandrKazlou/testApplication.git

Conflicts:
	.gitignore
	build.gradle
gitignore changes